No value-add changes to silence signed/unsigned comparison warnings.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 9db7ba3e168f0d49c78b542a9132e772697b65bf..d763000c0076e4f5400c04bd6e6b304d651d9e43 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -309,6 +309,7 @@ typedef struct {
        int  sat;       /* Optional: number of sats used for fix */
 
        int heartrate;   /* Beats per minute: likely to get moved to fs. */
+       float temperature; /* Degrees celsius */
        geocache_data gc_data;
        format_specific_data *fs;
        void *extra_data;       /* Extra data added by, say, a filter. */
@@ -375,8 +376,8 @@ void free_gpx_extras (xml_tag * tag);
 void xcsv_setup_internal_style(const char *style_buf);
 void xcsv_read_internal_style(const char *style_buf);
 waypoint * find_waypt_by_name(const char *name);
-void waypt_backup(unsigned int *count, queue **head_bak);
-void waypt_restore(unsigned int count, queue *head_bak);
+void waypt_backup(signed int *count, queue **head_bak);
+void waypt_restore(signed int count, queue *head_bak);
 
 route_head *route_head_alloc(void);
 void route_add (waypoint *);
@@ -401,10 +402,10 @@ route_head * route_find_track_by_name(const char *name);
 unsigned int route_waypt_count(void);
 unsigned int route_count(void);
 unsigned int track_count(void);
-void route_backup(unsigned int *count, queue **head_bak);
-void route_restore(unsigned int count, queue *head_bak);
-void track_backup(unsigned int *count, queue **head_bak);
-void track_restore(unsigned int count, queue *head_bak);
+void route_backup(signed int *count, queue **head_bak);
+void route_restore(signed int count, queue *head_bak);
+void track_backup(signed int *count, queue **head_bak);
+void track_restore(signed int count, queue *head_bak);
 
 /*
  * All shortname functions take a shortname handle as the first arg.

diff --git a/gpsbabel/main.c b/gpsbabel/main.c
index 23b4b77a5c64eb24d5e921e322de70347d3f3ae0..1c8eec4785d2693eb5390ea7c75eded31e0a36fd 100644 (file)
--- a/gpsbabel/main.c
+++ b/gpsbabel/main.c
@@ -96,7 +96,7 @@ main(int argc, char *argv[])
        int did_something = 0;
        const char *prog_name = argv[0]; /* argv is modified during processing */
        queue *wpt_head_bak, *rte_head_bak, *trk_head_bak;      /* #ifdef UTF8_SUPPORT */
-       unsigned int wpt_ct_bak, rte_ct_bak, trk_ct_bak;        /* #ifdef UTF8_SUPPORT */
+       signed int wpt_ct_bak, rte_ct_bak, trk_ct_bak;  /* #ifdef UTF8_SUPPORT */
 
        global_opts.objective = wptdata;
        global_opts.masked_objective = NOTHINGMASK;     /* this makes the default mask behaviour slightly different */

diff --git a/gpsbabel/route.c b/gpsbabel/route.c
index 52c76b4125f9ec98cf275cc587853a6227bbd4e8..db322b05c8d4e26c674f970bbd93793da505209e 100644 (file)
--- a/gpsbabel/route.c
+++ b/gpsbabel/route.c
@@ -263,7 +263,7 @@ route_flush_all()
 }
 
 void
-route_backup(unsigned int *count, queue **head_bak)
+route_backup(signed int *count, queue **head_bak)
 {
        queue *elem, *tmp, *elem2, *tmp2;
        queue *qbackup;
@@ -340,7 +340,7 @@ common_restore_finish(void)
 }
 
 void
-route_restore(unsigned int count, queue *head_bak)
+route_restore(signed int count, queue *head_bak)
 {
        if (head_bak == NULL) return;
        
@@ -353,7 +353,7 @@ route_restore(unsigned int count, queue *head_bak)
 }
 
 void
-track_backup(unsigned int *count, queue **head_bak)
+track_backup(signed int *count, queue **head_bak)
 {
        queue *elem, *tmp, *elem2, *tmp2;
        queue *qbackup;
@@ -396,7 +396,7 @@ track_backup(unsigned int *count, queue **head_bak)
 }
 
 void
-track_restore(unsigned int count, queue *head_bak)
+track_restore(signed int count, queue *head_bak)
 {
        if (head_bak == NULL) return;
        

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index fa0438584c7f8274f92fa62e948966ac48dbda45..82d61a2660dd92418004427c8e431b788f5b7091 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -844,7 +844,7 @@ strip_html(const utf_string *in)
        char *outstring, *out;
        char *instr = in->utfstring;
        char tag[8];
-       short int taglen;
+       unsigned short int taglen = 0;
        
        if (!in->is_html)
                return xstrdup(in->utfstring);

diff --git a/gpsbabel/waypt.c b/gpsbabel/waypt.c
index ddd66e0140c99cb5551a5746781759f262fe97e2..bc5059d0bd22baa5c9cd71272f86e5eb3c9eca3f 100644 (file)
--- a/gpsbabel/waypt.c
+++ b/gpsbabel/waypt.c
@@ -341,7 +341,7 @@ waypt_flush_all()
 }
 
 void
-waypt_backup(unsigned int *count, queue **head_bak)
+waypt_backup(signed int *count, queue **head_bak)
 {
        queue *elem, *tmp, *qbackup;
        waypoint *wpt;
@@ -367,7 +367,7 @@ waypt_backup(unsigned int *count, queue **head_bak)
 }
 
 void
-waypt_restore(unsigned int count, queue *head_bak)
+waypt_restore(signed int count, queue *head_bak)
 {
        if (head_bak == NULL) return;